auto upstream
authorJoakim Verona <joakim@verona.se>
Wed, 19 Dec 2012 14:07:20 +0000 (15:07 +0100)
committerJoakim Verona <joakim@verona.se>
Wed, 19 Dec 2012 14:07:20 +0000 (15:07 +0100)
1  2 
src/window.c

diff --cc src/window.c
Simple merge